Update documentation on overrides

 - target.linker does not seem to be supported anymore, only target.$triple.linker works, so merged these sections.
 - Added note about supported target.$triple.ar

diff --git a/src/doc/config.md b/src/doc/config.md
index 1b3ae50c6c2ab4440d406b3edeb8ef84c5faf3cd..382b5c145297b52d6608cc5c56da357ca3f741cf 100644 (file)
--- a/src/doc/config.md
+++ b/src/doc/config.md
@@ -57,19 +57,15 @@ email = "..."
 vcs = "none"
 
 # For the following sections, $triple refers to any valid target triple, not the
-# literal string "$triple", and it will apply whenever that target triple is
-# being compiled to. 'cfg(...)' refers to the Rust-like `#[cfg]` syntax for 
+# literal string "$triple", and it will apply whenever that target triple is\r
+# being compiled to. 'cfg(...)' refers to the Rust-like `#[cfg]` syntax for
 # conditional compilation.
-[target]
-# For Cargo builds which do not mention --target, this is the linker
-# which is passed to rustc (via `-C linker=`). By default this flag is not
-# passed to the compiler.
-linker = ".."
-
-[target.$triple]
-# Similar to the above linker configuration, but this only applies to
-# when the `$triple` is being compiled for.
-linker = ".."
+[target.$triple]\r
+# This is the linker which is passed to rustc (via `-C linker=`) when the `$triple`\r
+# is being compiled for. By default this flag is not passed to the compiler.
+linker = ".."\r
+# Same but for the library archiver which is passed to rustc via `-C ar=`.\r
+ar = ".."
 # custom flags to pass to all compiler invocations that target $triple
 # this value overrides build.rustflags when both are present
 rustflags = ["..", ".."]